From 51c6eb961e77ea871c54955c282b9c55a5e98b49 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 30 Sep 2005 14:57:02 +0000 Subject: [PATCH] Prevent overflow when storing size hints in an unsigned short variable. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2005-09-30 Matthias Clasen * gtk/gtksocket-x11.c (_gtk_socket_windowing_size_request): Prevent overflow when storing size hints in an unsigned short variable. Tracked down by Ray Strode and Søren Sandmann. --- ChangeLog | 9 ++++++++- ChangeLog.pre-2-10 | 9 ++++++++- gtk/gtksocket-x11.c | 8 ++++---- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8190ac9d9c..e5c9326c86 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-09-30 Matthias Clasen + + * gtk/gtksocket-x11.c (_gtk_socket_windowing_size_request): + Prevent overflow when storing size hints in an unsigned + short variable. Tracked down by Ray Strode and Søren Sandmann. + 2005-09-29 Matthias Clasen * gtk/gtkbutton.c (gtk_button_set_image): Check arguments. (#317491, @@ -310,7 +316,8 @@ Thu Sep 15 15:27:55 2005 Tim Janik 2005-09-14 Tristan Van Berkom - * gtk/gtkcolorbutton.c: Check "color" argument in gtk_color_button_set_color () + * gtk/gtkcolorbutton.c: Check "color" argument in + gtk_color_button_set_color () 2005-09-14 Matthias Clasen diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 8190ac9d9c..e5c9326c86 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2005-09-30 Matthias Clasen + + * gtk/gtksocket-x11.c (_gtk_socket_windowing_size_request): + Prevent overflow when storing size hints in an unsigned + short variable. Tracked down by Ray Strode and Søren Sandmann. + 2005-09-29 Matthias Clasen * gtk/gtkbutton.c (gtk_button_set_image): Check arguments. (#317491, @@ -310,7 +316,8 @@ Thu Sep 15 15:27:55 2005 Tim Janik 2005-09-14 Tristan Van Berkom - * gtk/gtkcolorbutton.c: Check "color" argument in gtk_color_button_set_color () + * gtk/gtkcolorbutton.c: Check "color" argument in + gtk_color_button_set_color () 2005-09-14 Matthias Clasen diff --git a/gtk/gtksocket-x11.c b/gtk/gtksocket-x11.c index 0470a7c896..9554d67ffc 100644 --- a/gtk/gtksocket-x11.c +++ b/gtk/gtksocket-x11.c @@ -101,13 +101,13 @@ _gtk_socket_windowing_size_request (GtkSocket *socket) { if (hints.flags & PMinSize) { - socket->request_width = hints.min_width; - socket->request_height = hints.min_height; + socket->request_width = MAX (hints.min_width, 1); + socket->request_height = MAX (hints.min_height, 1); } else if (hints.flags & PBaseSize) { - socket->request_width = hints.base_width; - socket->request_height = hints.base_height; + socket->request_width = MAX (hints.base_width, 1); + socket->request_height = MAX (hints.base_height, 1); } } socket->have_size = TRUE; -- 2.30.2